From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Thu, 6 Jun 2013 20:47:14 +0000 (+0200)
Subject: Merge branch 'lchevalier'
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/%7B%24conf-%3EScriptPath%7D/%7B%7B%20url_for%28%27vote_deletechoices%27%2C%20idvote=vote.id%2C%20iduser=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=56746fe72a690c7c36e655ef5188b15803be8922;p=lhc%2Fateliers.git

Merge branch 'lchevalier'
---

56746fe72a690c7c36e655ef5188b15803be8922